Skip to content

STYLE Reduce merge conflicts with force_grid_wrap=1 #51693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 2 commits into from
Closed

STYLE Reduce merge conflicts with force_grid_wrap=1 #51693

wants to merge 2 commits into from

Conversation

MarcoGorelli
Copy link
Member

@MarcoGorelli MarcoGorelli commented Feb 28, 2023 •
edited
Loading

Exact commands I ran:

git fetch upstream
git reset --hard upstream/main
sed -i 's/force_grid_wrap = 2/force_grid_wrap = 1/g' pyproject.toml 
pre-commit run isort -a
git commit -a -m 'force_grid_wrap=1' --no-verify

I then added an extra commit to update the future-imports check to the new style. No other adjustments were necessary

@MarcoGorelli MarcoGorelli mentioned this pull request Feb 28, 2023
Closed
simonjayhawkins
simonjayhawkins approved these changes Feb 28, 2023
View reviewed changes
Copy link
Member

@simonjayhawkins simonjayhawkins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @MarcoGorelli

This looks like the lesser of the two evils.

@MarcoGorelli MarcoGorelli mentioned this pull request Feb 28, 2023
Closed
5 tasks
@Dr-Irv
Copy link
Contributor

Dr-Irv commented Feb 28, 2023

Thanks @MarcoGorelli

This looks like the lesser of the two evils.

I agree. It's a reasonable compromise between readability and merge-ability.

@simonjayhawkins simonjayhawkins added the Code Style Code style, linting, code_checks label Mar 1, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Apr 1, 2023

This pull request is stale because it has been open for thirty days with no activity. Please update and respond to this comment if you're still interested in working on this.

@github-actions github-actions bot added the Stale label Apr 1, 2023
@MarcoGorelli
Copy link
Member Author

closing for now, doesn't look like there was that much support, and maybe merge conflicts don't annoy others as much as they annoy me 😄

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simonjayhawkins simonjayhawkins simonjayhawkins approved these changes

@rhshadrach rhshadrach rhshadrach approved these changes

Assignees
No one assigned
Labels
Code Style Code style, linting, code_checks Stale
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

STYLE Reduce merge conflicts with force_single_line or force_grid_wrap=1
4 participants
@MarcoGorelli @Dr-Irv @simonjayhawkins @rhshadrach